Enable all XCCDF groups when TP extends a profile#1199
Open
yuumasato wants to merge 1 commit intoComplianceAsCode:masterfrom
Open
Enable all XCCDF groups when TP extends a profile#1199yuumasato wants to merge 1 commit intoComplianceAsCode:masterfrom
yuumasato wants to merge 1 commit intoComplianceAsCode:masterfrom
Conversation
Keep track of all XCCDF Groups in the ProfileBundle and always enable them when a TailoredProfile extends a Profile. This ensures that any rule that is enabled has its parent Group enabled as well, ensuring that OpenSCAP can get to the rule that was enbled.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: yuumasato The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
Member
Author
|
The ProfileBundle ends up looking like this: |
|
🤖 To deploy this PR, run the following command: |
|
@yuumasato: The following tests failed, say
Full PR test history. Your PR dashboard. DetailsInstructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
sebrandon1
reviewed
May 1, 2026
| func TailoredProfileToXML(tp *cmpv1alpha1.TailoredProfile, p *cmpv1alpha1.Profile, pb *cmpv1alpha1.ProfileBundle, rules map[string]*cmpv1alpha1.Rule, variables []*cmpv1alpha1.Variable) (string, error) { | ||
| // Extract group IDs from ProfileBundle annotation if this TP extends a profile | ||
| var groupIDs []string | ||
| if p != nil { |
There was a problem hiding this comment.
Should this also check if pb is nil?
| pb.SetAnnotations(annotations) | ||
|
|
||
| // Update the ProfileBundle with the new annotation | ||
| if err := pcfg.Client.Update(context.TODO(), pb); err != nil { |
There was a problem hiding this comment.
Should this be Patch to avoid updating the entire object?
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Keep track of all XCCDF Groups in the ProfileBundle and always enable them when a TailoredProfile extends a Profile.
This ensures that any rule that is enabled has its parent Group enabled as well, ensuring that OpenSCAP can get to the rule that was enbled.
If a TailoredProfile enables a rule that is not part of an XCCDF group enabled by the extended profile, the rule won't be enabled at all by OpenSCAP. This is because data stream traversal will stop at the disabled group.
Issue discovered when testing ComplianceAsCode/content#14665